testsuite: cosmetics

Put all tests in a suite, and order them in a nicer way.
This makes the test output look better.

diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 6a3a17e5880bb2caf5821d319407fc47299d368c..f4688b985b25540e8c39b86ea6b1b1ad7afd4bb3 100644 (file)
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -21,7 +21,8 @@ foreach t: a11y_tests
                     install_dir: testexecdir,
                     dependencies: libgtk_dep),
         args: [ '--tap', '-k', ],
-        env: installed_test_env)
+        env: installed_test_env,
+        suite: 'a11y')
 endforeach
 
 a11y_installed_tests = [

diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index 5df0da85cd38803c078fe91d1b8f5abb7719a15e..de9b12329f53464bfe00e7c721e90c4353ddbdc9 100644 (file)
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -6,7 +6,7 @@ test_api = executable('api', 'api.c',
                       install: get_option('install-tests'),
                       install_dir: join_paths(installed_test_bindir, 'css'),
                       dependencies: libgtk_dep)
-test('css/api', test_api)
+test('api', test_api, suite: 'css')
 
 if get_option('install-tests')
   conf = configuration_data()

diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index e0f63b75d5cf11d513a474149317530a88442a5a..9dbbd48e2c210ece390e87a362d9eafb4ce081b6 100644 (file)
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -3,7 +3,7 @@ test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                         dependencies: libgtk_dep)
-test('css/nodes/test-nodes', test_nodes)
+test('test-nodes', test_nodes, suite: 'css')
 
 test_data = [
   'box.ltr.nodes',

diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index ef953f999a4dbea253a9ce0c6fafaf704a91ac8e..3ea4bf013a3dbe8fdd1f8dd5adbed92667aa545b 100644 (file)
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -4,7 +4,7 @@ test_parser = executable('test-css-parser', 'test-css-parser.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                          dependencies: libgtk_dep)
-test('css/parser/css-parser', test_parser)
+test('css-parser', test_parser, suite: 'css')
 
 test_data = [
   'animation-crash-3.12.css',

diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 0554aad1d5f83949929b681b0b312fa6d450288f..248e52a4bd9ae8e1effc4ca4dc968d65ed390c1a 100644 (file)
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -14,7 +14,7 @@ test_style = executable(
   install_dir: testexecdir,
   dependencies: libgtk_dep,
 )
-test('css/style/test-style', test_style)
+test('test-style', test_style, suite: 'css')
 
 test_data = [
   'adjacent-states.css',

diff --git a/testsuite/meson.build b/testsuite/meson.build
index f9b97da5868dc704ad303980a8c315baa079db58..fa283dd65cdd1c41d86842ad7f19fb5ef327c8c5 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -11,10 +11,10 @@ installed_test_env = [
   'G_ENABLE_DIAGNOSTIC=0',
 ]
 
+subdir('gdk')
 subdir('gsk')
-subdir('tools')
 subdir('gtk')
-subdir('gdk')
 subdir('css')
 subdir('a11y')
-subdir('reftests')
+subdir('tools')
+#subdir('reftests')

diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build
index d705601c62cbf250ce7668b7a7ebd40f17abba33..316b0b64c54561728ab1e50643b909749be576e9 100644 (file)
--- a/testsuite/tools/meson.build
+++ b/testsuite/tools/meson.build
@@ -12,7 +12,8 @@ if bash.found()
     test('test-@0@'.format(t), bash,
       args : 'test-@0@'.format(t),
       workdir : meson.current_build_dir(),
-      env : test_env)
+      env : test_env,
+      suite: 'tools')
   endforeach
 endif # bash found